+ostree (2016.7-1) UNRELEASED; urgency=medium
+
+ * New upstream version
+ - drop all patches, applied upstream
+
+ -- Simon McVittie <smcv@debian.org> Sat, 16 Jul 2016 21:07:05 +0100
+
ostree (2016.6-4) unstable; urgency=medium
* Switch sense of check in debian/test.sh so we really ignore test
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Sun, 26 Jun 2016 14:26:37 +0100
-Subject: entry_pathname_test_helper: these tests need extended attributes
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
----
- tests/test-libarchive-import.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/test-libarchive-import.c b/tests/test-libarchive-import.c
-index aaa3c37..3ef379e 100644
---- a/tests/test-libarchive-import.c
-+++ b/tests/test-libarchive-import.c
-@@ -433,6 +433,9 @@ entry_pathname_test_helper (gconstpointer data, gboolean on)
- OstreeRepoCommitModifier *modifier = NULL;
- gboolean met_etc_file = FALSE;
-
-+ if (skip_if_no_xattr (td))
-+ goto out;
-+
- modifier = ostree_repo_commit_modifier_new (0, NULL, NULL, NULL);
- ostree_repo_commit_modifier_set_xattr_callback (modifier, path_cb,
- NULL, &met_etc_file);
+++ /dev/null
-From: Colin Walters <walters@verbum.org>
-Date: Mon, 20 Jun 2016 18:13:58 -0400
-Subject: libostree.sym: Fix test-symbols
-
-The test isn't smart enough to ignore comments, so change the prefix.
-
-Closes: #356
-Approved by: jlebon
-Origin: upstream, 2016.7, commit:0134c621575fcb43bb9d994251831845dac8dbd1
----
- src/libostree/libostree.sym | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libostree/libostree.sym b/src/libostree/libostree.sym
-index e8cca9d..087f987 100644
---- a/src/libostree/libostree.sym
-+++ b/src/libostree/libostree.sym
-@@ -350,6 +350,6 @@ global:
- /*
- LIBOSTREE_2016.7 {
- global:
-- ostree_some_new_symbol;
-+ someostree_some_new_symbol;
- } LIBOSTREE_2016.6;
- */
+++ /dev/null
-From: Alexander Larsson <alexl@redhat.com>
-Date: Thu, 23 Jun 2016 11:51:15 +0200
-Subject: pull: Correctly handle repo->parent_repo when applying static deltas
-
-In flatpak i was using a parent repo, and it failed to update
-with ENOENT when dispatching an set-read-source opcode, because the
-object it referenced was in the parent repo.
-
-This fixes that by making _ostree_repo_read_bare_fd look
-at parent_repo.
-
-Closes: #362
-Approved by: cgwalters
-Origin: upstream, 2016.7, commit:fc4a7ec35e6e7a3a2db80257508faa592329786c
----
- src/libostree/ostree-repo.c | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
-index e86685b..b835348 100644
---- a/src/libostree/ostree-repo.c
-+++ b/src/libostree/ostree-repo.c
-@@ -2715,18 +2715,29 @@ _ostree_repo_read_bare_fd (OstreeRepo *self,
- GError **error)
- {
- char loose_path_buf[_OSTREE_LOOSE_PATH_MAX];
--
-+
- g_assert (self->mode == OSTREE_REPO_MODE_BARE ||
- self->mode == OSTREE_REPO_MODE_BARE_USER);
-
- _ostree_loose_path (loose_path_buf, checksum, OSTREE_OBJECT_TYPE_FILE, self->mode);
--
-- *out_fd = openat (self->objects_dir_fd, loose_path_buf, O_RDONLY | O_CLOEXEC);
-- if (*out_fd < 0)
-+
-+ if (!ot_openat_ignore_enoent (self->objects_dir_fd, loose_path_buf, out_fd, error))
-+ return FALSE;
-+
-+ if (*out_fd == -1)
- {
-- glnx_set_error_from_errno (error);
-+ if (self->parent_repo)
-+ return _ostree_repo_read_bare_fd (self->parent_repo,
-+ checksum,
-+ out_fd,
-+ cancellable,
-+ error);
-+
-+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
-+ "No such file object %s", checksum);
- return FALSE;
- }
-+
- return TRUE;
- }
-
+++ /dev/null
-libostree.sym-Fix-test-symbols.patch
-pull-Correctly-handle-repo-parent_repo-when-applying-stat.patch
-tests-use-our-own-generated-libtool-not-the-one-in-PATH.patch
-tests-fail-the-build-if-symlinking-tests-ostree-fails.patch
-entry_pathname_test_helper-these-tests-need-extended-attr.patch
-tests-Improve-check-for-proc-cmdline-kargs.patch
+++ /dev/null
-From: Dan Nicholson <nicholson@endlessm.com>
-Date: Fri, 13 May 2016 12:53:01 -0700
-Subject: tests: Improve check for /proc/cmdline kargs
-
-On some systems there may be no root= argument, so the tests for
-appending /proc/cmdline arguments will fail. Instead, loop over each of
-the arguments in the host's /proc/cmdline and test that they're in the
-constructed config file. That will actually test if ostree added all of
-the system's /proc/cmdline args correctly. The regex isn't perfect here,
-but it's probably good enough for this test.
-
-Closes: #372
-Approved by: cgwalters
-Origin: upstream, commit:https://github.com/ostreedev/ostree/commit/a94530111a31ff3784af293a6cd4da4c3c7bc34c
----
- tests/test-admin-deploy-karg.sh | 7 +++----
- tests/test-admin-instutil-set-kargs.sh | 7 +++----
- 2 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/tests/test-admin-deploy-karg.sh b/tests/test-admin-deploy-karg.sh
-index 2ce8862..1165b42 100755
---- a/tests/test-admin-deploy-karg.sh
-+++ b/tests/test-admin-deploy-karg.sh
-@@ -43,10 +43,9 @@ assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'option
- echo "ok deploy with --karg, but same config"
-
- ${CMD_PREFIX} ostree admin deploy --karg-proc-cmdline --os=testos testos:testos/buildmaster/x86_64-runtime
--# Here we're asserting that the *host* system has a root= kernel
--# argument. I think it's unlikely that anyone doesn't have one, but
--# if this is not true for you, please file a bug!
--assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*root=.'
-+for arg in $(cat /proc/cmdline); do
-+ assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf "options.*$arg"
-+done
-
- echo "ok deploy --karg-proc-cmdline"
-
-diff --git a/tests/test-admin-instutil-set-kargs.sh b/tests/test-admin-instutil-set-kargs.sh
-index 0af940f..d2abec2 100755
---- a/tests/test-admin-instutil-set-kargs.sh
-+++ b/tests/test-admin-instutil-set-kargs.sh
-@@ -54,8 +54,7 @@ assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'option
- echo "ok instutil set-kargs --append"
-
- ${CMD_PREFIX} ostree admin instutil set-kargs --import-proc-cmdline
--# Here we're asserting that the *host* system has a root= kernel
--# argument. I think it's unlikely that anyone doesn't have one, but
--# if this is not true for you, please file a bug!
--assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf 'options.*root=.'
-+for arg in $(cat /proc/cmdline); do
-+ assert_file_has_content sysroot/boot/loader/entries/ostree-testos-0.conf "options.*$arg"
-+done
- echo "ok instutil set-kargs --import-proc-cmdline"
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Sun, 26 Jun 2016 13:57:13 +0100
-Subject: tests: fail the build if symlinking tests/ostree fails
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
----
- Makefile-tests.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile-tests.am b/Makefile-tests.am
-index 25b8202..9be9061 100644
---- a/Makefile-tests.am
-+++ b/Makefile-tests.am
-@@ -245,7 +245,8 @@ ALL_LOCAL_RULES += tests/libreaddir-rand.so
- CLEANFILES += tests/libreaddir-rand.so tests/ostree-symlink-stamp tests/ostree
-
- tests/ostree-symlink-stamp: Makefile
-- @real_bin=`cd $(top_builddir) && ./libtool --mode=execute echo ostree`; \
-+ @set -e; \
-+ real_bin=`cd $(top_builddir) && ./libtool --mode=execute echo ostree`; \
- ln -sf "$${real_bin}" tests/ostree; \
- touch $@
-
+++ /dev/null
-From: Simon McVittie <smcv@debian.org>
-Date: Sun, 26 Jun 2016 13:56:05 +0100
-Subject: tests: use our own generated libtool, not the one in $PATH
-
-libtoolize creates a version of libtool for the right architecture
-in $(top_builddir), which is guaranteed to be present, and is
-guaranteed to match what we are compiling (even during
-cross-compilation).
-
-Packaging systems sometimes separate /usr/bin/libtool, which is
-specific to one architecture, from the libtool development files
-such as libtoolize and ltmain.sh, which are architecture-independent.
-For example, in Debian, libtool_*_all.deb contains the files necessary
-to libtoolize a package and is depended on by the dh-autoreconf package,
-but libtool-bin_*_amd64.deb (or whatever architecture) contains
-/usr/bin/libtool and is not normally necessary to depend on.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
----
- Makefile-tests.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile-tests.am b/Makefile-tests.am
-index 8090307..25b8202 100644
---- a/Makefile-tests.am
-+++ b/Makefile-tests.am
-@@ -245,7 +245,7 @@ ALL_LOCAL_RULES += tests/libreaddir-rand.so
- CLEANFILES += tests/libreaddir-rand.so tests/ostree-symlink-stamp tests/ostree
-
- tests/ostree-symlink-stamp: Makefile
-- @real_bin=`cd $(top_builddir) && libtool --mode=execute echo ostree`; \
-+ @real_bin=`cd $(top_builddir) && ./libtool --mode=execute echo ostree`; \
- ln -sf "$${real_bin}" tests/ostree; \
- touch $@
-
projects / ostree.git / commitdiff